4e13eae10a6fcb30846e786bc76b78f3f1fcbfb8,components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinTracer.java,ZipkinTracer,serverRequest,#Brave#String#Exchange#,544
Before Change
// and reset binder
serverBinder.setCurrentSpan(null);
if (log.isDebugEnabled()) {
String traceId = "<null>";
if (span.getSpan() != null) {
traceId = "" + span.getSpan().getTrace_id();
}
String spanId = "<null>";
if (span.getSpan() != null) {
spanId = "" + span.getSpan().getId();
}
String parentId = "<null>";
if (span.getSpan() != null) {
parentId = "" + span.getSpan().getParent_id();
}
log.debug("serverRequest [service={}, traceId={}, spanId={}, parentId={}]", serviceName, traceId, spanId, parentId);
}
return span;
After Change
// and reset binder
serverBinder.setCurrentSpan(null);
if (span != null && span.getSpan() != null && log.isDebugEnabled()) {
String traceId = "" + span.getSpan().getTrace_id();
String spanId = "" + span.getSpan().getId();
String parentId = span.getSpan().getParent_id() != null ? "" + span.getSpan().getParent_id() : null;
if (log.isDebugEnabled()) {
if (parentId != null) {
log.debug(String.format("serverRequest [service=%s, traceId=%20s, spanId=%20s, parentId=%20s]", serviceName, traceId, spanId, parentId));
} else {
log.debug(String.format("serverRequest [service=%s, traceId=%20s, spanId=%20s]", serviceName, traceId, spanId));
}
}
}